(rcirc-default-user-full-name): Default to `rcirc-default-user-name' instead

of `rcirc-user-name' (which no longer exists).
(rcirc-process-list): Check `buffer-live-p' before attempting to switch to a
buffer.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 683d7c6f3c11b587551e82669ffd804c9753359f..1f051ffa9f26c3553d0ea8823caf6a18b728abd9 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -74,7 +74,7 @@
   :group 'rcirc)
 
 (defcustom rcirc-default-user-full-name (if (string= (user-full-name) "")
-                                           rcirc-user-name
+                                           rcirc-default-user-name
                                          (user-full-name))
   "The full name sent to the server when connecting."
   :type 'string
@@ -469,7 +469,7 @@ Functions are called with PROCESS and SENTINEL arguments.")
   "Return a list of rcirc processes."
   (let (ps)
     (mapc (lambda (p)
-            (when (process-buffer p)
+            (when (buffer-live-p (process-buffer p))
               (with-rcirc-process-buffer p
                 (when (eq major-mode 'rcirc-mode)
                   (setq ps (cons p ps))))))